sonu: code review