CoffeeScript refactoring - part 2