Minor tidy/tweaks

Adjustments based on discussion.