[+] formatting
[+] template improvements