refactorings sorted
4 files changed