more minor stylistic changes