code cleanup; no new logic