review comments, style + formatting