minor refactor to repoSpec
few minor refactorings