More CoffeeScript conversion