Small tidyup remocing comments and whitespace changes