More refactoring
2 files changed