Refactor box