Refactor path spec for clarity