Changes after code review

Changes after code review