Refactored check-off code