even more cleanup, pedantic mostly