Clean up and add switches to pgrep