moved commas, fixed indents