Code review comments

I have added some comments with #### as my review comments. I could come up with only a few.