Tidy and improve documentation