Couple of more style updates