Nitfixes
Fixed spaces and equals
More nit fixes