Code Cleanup

Code beautified with bracket's beautify extension
https://github.com/drewhjava/brackets-beautify