trim and format fix