formatting; dead code removal

Cleans up any commented out code, fixes formatting for things that are using spaces instead of tabs.