Added some small code-review feedback