Stylistic cleanup