More 'refactoring'