Stylistic cleanup only. No logic changes.