more cleanup/formatting