studio cleanup

A couple of relatively minor cleanups in studio. Grunt tests all pass. I'll probably also try to do a little bit of a manual pass.
:+1: Much cleaner!