Pl code clean up.