Various CS fixes

- Add missing space
- Remove extra space
- Indentation fixes
CS Fixes: Templates
Merge branch '1.5-cs-fixes'