Minor rewriting