Seema&Michal: Code review changes