Remove Complexity
Class Rename