cleaned a bit, relying more on coffeescript features