cleanup; more comments