More minor tidy edits