Fixes #262 (.pp file tidy)