Minor refactorings and comment fixes
If "correcting" comments, please do it correctly.