Refactor: Cleanup time span handling of incidents