b4 refactoring