Code cleaning in Rewrite, may also result faster.