Additional commenting and reformatting