Few Style changes and comments from code review