clean up and playing with coffeescript features