cleanup
updated CPT labels and content for #5