minor cleanup and rewording a few things