Cleaned up code and messages in success handler