Clean up and update docs