Improvement: clean up some of the `attack` messages for clarity