Redue log spew
Comment cleanup
Fixup code formatting