Minimal refactoring
More refactoring
More refactoring