Even more stylistic changes