some more cleanup

updated formatting