clean up doc, names, etc.