fixed various formatting issues