PR comments refactor #2