Beverly | refactoring