check_complete refactor