Small cleanup - Think I know what we're looking for