Improved doc formatting