minor rewrite per justin