[FEATURE] Refactored the code to use DI better and remove unneeded helper classes