Improved documentation consistency and span