Code cleanup pass

-Removed some extraneous tests and commented code
-Better whitespace formatting