Refactoring: This class is too large