Merge pull request #799 from ARNHOE/3.1

Updated templates to be more consistent and removed trailing spaces