WGS84 token fixes

Solves #627 
What style guide says about this? I mean, the right patter is

```
if ( .. && .. )
```

or 

```
if ((...) && (...))
```