Some more stylistic changes