Some style improvements
Merge branch 'master' of github.com:vkarpov15/axl-server