Start class refactoring