MEDIUM / Refactoring / Work in progress... (refactoring validation)