some more cleanup lol