Clean up comments
Improve vertical spacing