More Refining for Repo Script