more style improvements