Edits from Andy's review