Improve documentation further