a bit more style cleanup