HomeMusing Studio

Code cleanup in prep for PR. T710