last code review fixes