Stylistic cleanup.