[PB] {refactoring} Random cleanup