Addresed Anish code review comments, and insights