Cleaning up for Ptyhonese