fixing up changes from code review