changes as suggested by @dianakhuang and @jbau

@chrisndodge Kindly review the changeset.

Thanks
@chrisndodge  i have made the changes suggested by @singingwolfboy . Kindly review

THanks