Code review

Hi Moshe.  Let me know when you are free and I can talk you through the changes I made.