some more cleanup/sanitazation