Minor cleanup; updated docs