More refactoring for pcl.