Tidy up of commented code and whitespace