Some refactoring

https://github.com/JustBuild/Project-Axeman/issues/77
Merge branch 'master' of https://github.com/JustBuild/Project-Axeman