code cleanup; no functionality changes