Neatened some cpps