Stylistic fixes