Slight refactor of path variables