PFS-1119 #comment refactorings