Code refactoring.
3 files changed