Improve all the codes

[porwal-yash]

kindly improve the codes as much as you can.

[MustaphaGHA]

Hello , i'd like to work on this issue , would you assign it to me please ? Thank you