Normal Forms for One- and Two-Sided Surfaces