Class Refactoring 2.0