More refactoring
More refactoring