Reformatted a few things again to make them easier to code.
Merge pull request #263 from Clashnia/hqm

Reformatted a few things again to make them easier to code.