improvements to STYLE from suggestions