Refactoring never ends ...