[task] refactoring
[task] still refactoring
[task] fixed internal user retrieval
Merge pull request #3 from dacrome/refactoring-self-admin

[task] refactoring