Make control flow more explicit