Fix comma placement, ordering