refactorings improved
5 files changed