Formatting Improvements

Made a couple of much needed formatting improvements to the `Death` class. See commit descriptions for details. I have not compiled this as I do not have the required libraries, so I would advise it is tested before it is merged in case I made a mistake somewhere.