Added more code review comments