Refactor box
Refactor box