clean up

just some small clean-up tasks