clean code + death messages