Added more CoffeeScript improvements