Refactor #159
Description
Refactor the code.
Refactor code with these practices. For discussion drop a message in this chat room.
Tip: You can pick any one point from the list given in this link and start implementing that.
In order to self-assign this issue comment here with @kpbot claim, and read contributing guidelines.