Two normal forms for rewriting P-systems