A bit of cleanup/inlining/reordering for https://github.com/phetsims/ph-scale/issues/71
A bit of cleanup/inlining/reordering for https://github.com/phetsims/ph-scale/issues/71

phetsims/sun,phetsims/sun,phetsims/sun