small improvements to style