Little cleanup before joining the parts into the whole
Changed the Name of the Class