decoupling methods, and refactoring user auth
Merge commit '49dc102'