Adding the formalism, simplifying the normal form, dropping the types, and etc