various formatting fixes