minor code changes during code review