Rewrite with string comp and comments