I've checked in the below obvious cleanup.

- Volodya