Bedfore refactoring