Clean up, and make more coffeescripty