Refactoring.


4 files changed