Rewrite for consistency