Code hygiene fixed, no functional change