Minor tidy edits