Minor rewrite