Squashing bugs
Clean up main.coffee