Add some more style improvements