Get rid of hit struct - use multiple return values