code cleaning (no functional changes)