Big class refactoring