Cleanup form code
Cleanup checkout form semantics + englsih email update