more style cleanup