Refactor underscore homework