Tidy up the sandbox stuff a little