Refacotring.
2 files changed