code cleanup
Merge branch 'develop' of https://github.com/PwnDoRa/mazu