A bit of refactoring on the item repository
Merge pull request #40 from OpenPassword/feature/A-bit-more-refactoring

A bit of refactoring on the item repository