Some refactoring
More refactoring