More cleanup especially in documentation