Doc - Improve format