Minor Tweaks to improve consistency and clarity