More refactoring.
3 files changed