stylistic cleanup.