cleanup; bug fix