improvements to style