some stylistic changes