More cleanup and docs