general clean up and packagey-ness