Edits to bring the file into line with coding standards