More refactored.