refactored the class name