Refactored CoffeeScript