Fix white spaces at end of some lines

This patch will remove some white spaces from templates. It will help to make packages without extra bytes. Thanks!