Refactoring
More refactoring