clean up sandbox, fix some PSR and doc blocs