Coffeescript, minor changes for readability