more coffeescript. some more organization