more small stylistic changes