Cleanup on Coffee to JS conversion