PFS-457 #comment refactorings