Final refactoring changes