Code review

Hi Doron,

Let me know if you want to go through the changes I made together.

Mary