Minor edits and tidying.