Cleanup and update docs