minor code review fixes