Re-Standardization

Go back to standard by optimizing transaction and document type usage.