General edits/tidying 3