refactor to clean up PR