More refactoring to break things down into smaller chunks