Cleaned up my ArmourEvent, a lot.