further improvements to style