Minor improvements to style