#37 and #38 fix

Pls put spaces around `=` everywhere in the code.