More cleanup and doc