refactor around paths