Added spaces after commas, before & after operators