Beans refactoring