fix various formatting issues