after code review fixes