Use conditional rather than early return