More refactorings in PixelPosEstimator