More refactoring
Intermidiate things