cleaning up and making more useable