minor code review changes