minor tweaks to new style