Success/Failure Messages and Code Cleanup