more cleanup for formatting