cleaned up and packageable
initial release