More minor stylistic changes