wip: more style fixes @wip