Refactor Brick