refactored Pjaxr to match common patterns