Code Cleanup for challenge2