Some code cosmetics about commas, spaces and quotes
Merges #577