Documentation and cleanups