Cleaned up sandbox a little bit