Refactored beans