Coding standard fixes to the retreat threat overhaul