Refactoring of class
Removed instances of classes and added to Constructor Parameters