Clean up; remove alias p for clarity