cleaned up more coffeescript