Fixing coffeescript indent and doing a bit of cleanup.