More refactoring
More refactoring 2