-amoved normal form to normal_form