address svet code review comments