Minor refactoring
Repo change