small changes from code review