Improve maintainability index for the project

[sufyankhanrao]

The task is to;-

• Improve maintainability index (currently at C and should be A)
• Improve test coverage for the project if possible