Refactor Brick\Random