Minor edits to reduce duplication and tidy references