Refactorings.
3 files changed