OK, I'm not a fan of multiple exit points, but I think the new version is a little more readable.