MNT/DOC: Light changes related to refactor/commenting