Code cleanups
Merge branch 'master' of https://github.com/n13l/aaa-sec