Lint and clean up code per coffeescript style guide. Tests passing again