Coffeescript improvements per Schnur