Remove a bunch of 'else's after 'returns'