Minor edits from Goose