More refactoring, less debug printers