changes as suggested by @dianakhuang and @jbau

@chrisndodge Kindly review the changeset.

Thanks