Code refactoring
4 files changed