Improved doc format