cleanup and Doc update