Final Final refactoring