Refactor Run calculation and overlay management.