Cleanup of main.coffee