Start refactoring class