Results 2 comments of Hrishi-Raj

Thank You @shahednasser I have made the mentioned changes. Looking forward to your suggestions.

I just rebased my branch and merged the branches. Will this be fine?