#1 comments refactoring
some more for #1