Refactoring the code

[nitin42]

The code has to be refactored again. I will be working on this soon!

[acupy]

Hey @nitin42, thank you for your collaboration! Could you elaborate on the refactoring work that you are about to do? It would be interesting to see them broken down into separate issues.