Better Deaths 0.1.2 - Code Cleanup