more style fixes/refinements