Fix doc according to comments