cleanup and add coffeescript