Cleaned up code. Removed old stuff
Removed junk whitespace