Fix comments from review
Formatting tweak