More refactoring
5 files changed