Coffeescript updates per Schnur feedback
Clean-up based on Schnur recommendations