code cleanup; code coverage