Refactoring^2
More refactoring