format and spacing cleanup