Massive Code Cleanup
Massive Code Cleanup