clean up, some textual change