Added some more code review changes and removed which were fixed