Some more style changes #3