Refactor path, cleaning up