Fix expression spacing