Fix incorrect formating and operators