cleaning up and preparing to go opensource