Refactor flow control. Add final().