More coffeescript conversion