Now 'refactoring' ...