Cleanup/comments
Copious commenting