Fixed status success message typo and cleaned up
(cherry picked from commit 166f4a4c67e61334791b43a21845603c1295ab2c)
Fixed status success message typo and cleaned up
(cherry picked from commit 166f4a4c67e61334791b43a21845603c1295ab2c)