Fix documentation content and do some cleanup