Make data structure internal
Return the pair instead of a result indicator