Refactoring ... again