Could you revert this change? It is only as cosmetic change. I'd prefer to only remove the `else` clause instead to use the short-circuit `return`