Cleaned up coffeescript