Minor tweaks; shouldn't affect functionality.