Change of heart; -coffeescript +javascript
Clean up spacing, add comments back in