Remove unused import
Refactor form template macros