minor code review updates