Beta refactoring