Refactoring
Class refactoring