Review feedback + change handler.
Lint cleanup.