More refactoring, yo.