Standardization rewrite