minor tweaks to improve overall PR