Cleaning up bits of code.
Removing duplication in the HudFailsafe Class.
Merge pull request #274 from arthurbenemann/Refactoring

Refactoring