Changes based on code review
second round review changes
Third round review comments
minor word change