More CoffeeScript style cleanup