some more style changes;