Code Cleanup
Switched to CoffeeScript