Clean up and improve documentation