fixed some stylistic issues