various stylistic changes