Whitespace fixes, improved comments