Made Coffeescript syntax consistent (i.e. converted straight JS syntax)