brick rebind refactoring