refactor and tidy
Merge branch 'master' of https://github.com/notionparallax/ShadowWolf