Box: refactoring