Please let me know what do you think of the following changes!

Thanks for the PR!