Made some changes for code review