refactor the repository access
Merge pull request #8 from xabbuh/repository-refactoring

refactor the repository access