Add spaced before commas, before & after operators