Reorganized code, removed del on coffee-script