cleanup; comments