Minor edits to add variables where there were none and remove extraneous info