Simple to me rewrite