Comments improvement
Comments improvement (background)
Cleanup
Minor fixes