a bit more stylistic changes