more code review from slava