WIP: Refactor displayCombatMessage so it takes a string instead of callback. Refactor spacing and comments