Sure. I'll do the same if there other places too. Less checks but more duplication of code.