cleaned up exit code and messages