Simple beans declaration refactoring