aaaaand some more cleanup