BDD presentation refactoring