Cleanup Form Template & Refactoring