Refactor 'get_match' returns