Fix spaces and commas

Just for the sake of consistency :smiley: