removed whitespace and commented code

Hi Paul,

I have removed extra whitespace and deleted commented out code. I removed the commented code as it didn't look like it was being used.