Refactor to path.join