Fix documentation and review comments