Refactor retrieve method
Merge pull request #35 from phpmentoring/user-refactor-retrieve

Refactor retrieve method