PB-661 #comment code refactoring.