more style integration changes