Clean up CoffeeScript a bit