Roger's suggestions
Whitespace fixes I missed