Fixed up stylistic issues