code cleanup (no functional change)