Cleaned up Repo switching