clean up and simplify package