chore: cleanup markup for forms