simple rewrite + comments