clean up some more functionallity