Add spaces in conditions
Corrected a missing '=' in a condition