@synack, I have updated the and made some changes according to your request. Thanks for your suggestion.
