code review fixes from Diana