Fix comma hell