some more style-cleanup