update for new control flow and block brace policy