Revert "Revert "Cleanup of various inline comments""

This reverts commit 0f56cfc14b3b0db03036f593b24395f271db06c2.