Sandboxes got a little mangled in the formatting/linting/light refactoring cycle