Organizational and verbiage tweaks