Style fixes (mostly)