changes as suggested by @dianakhuang and @jbau

@chrisndodge Kindly review the changeset.

Thanks
@muhhshoaib thanks for the submission. Do you think you can implement @singingwolfboy suggestion today?

Thank you