Removal of additional comments

And other cosmetic improvements of "guts" of project.