Fixed stylistic issues