Improving doc consistency
Complete doc consistency check