#268: Minor changes, commas