Commit for refactoring week 2 errors