Cleanup
Finish port to CoffeeScript