Make commented out sections consistent

[nabsul]

Some sections that we need to uncomment are commented out using just the # character.

Others are commented out with #-space-space.

Makes it easy to mess up indentation of code.

[nabsul]

Or maybe use multi-line comments instead of the # comments?