code review comments added

**Don't merge this!**

This is purely for you all to see the DIFF of the comments I made in your code.