Apply the PEP8 style guidelines.

Conflicts:

	pcp
fixup! Apply the PEP8 style guidelines.