Style fixups