More refactoring to reduce complexity