Cosmetic changes and refactoring
Merge pull request #232 from davidbgk/898082-get-login-token

Cosmetic changes and refactoring