Some comment edits, a bit of refactoring