last step: make nice and do some more cleanup