stylistic cleanup