Simplify coding logic for in_progress?