Some more style changes