Styling, Total Deaths and refactoring