Doc update and cleanup