Fixing deprecation with template variable access

Quick update to fix the variable access.

```
Warning: Variable access via 'redis_port' is deprecated. Use '@redis_port' instead.
```

Some whitespace trimming has also been committed.