some stylistic fixes