Cleaner control flow