Switch order to (success, message) and do some cleanup