Clean up code, indenting, remove commented out code