Refactor eps_path