Review follow up:

- Reformat comments