Clean up "p" modifier