Refactoring
Changed to CoffeeScript