clean up and improve docs