coffeescript improvements