cleaned up a bit
Merge pull request #405 from nelenkov/dev

cleaned up authenticator a bit