minor changes after code review
minor changes after code review