Class refactoring