Small box refactoring

Sorry if this makes a merge conflict...