Cosmetic improvements in PCL code