Style updates from #6