Fix syntax and spaces