some more style modifications