minor refactor for paths