Behavior-Based Safety Improvement