added some more styling optimizations