further solari formatting cleanups