- Finish clean code water flow view.
- Fix minor bug.