Class refactoring
Class refactoring