Class Refactoring