Fix stylistic issues