Clean up p-and-c 1.1
Merge pull request #13 from solventz/cleanup-p-and-c-1

Clean up p-and-c 1.1