changes for code review comments