Code cleanup/fixup.
Merge branch 'master' of https://github.com/EasyWoW/easywow