Minor rewriting changes