More refactoring

Don't ask
tootoriulz