Some stylistic changes