Whitespace
Improve comments