boxing + refactoring