It doesn't seem like the early return here is needed. May just confuse things.