Update minor rewrite