Refactor according to code quality guidelines #226

Closed rahuljai-05 closed 6 days ago