Refactor Path