Reformated code again (was getting messy in certain places).
Merge pull request #52 from Clashnia/hqm

Reformated code again (was getting messy in certain places).