minor WakandaSandbox refactoring