JS 2 Coffee, few places refactored