Cleanup and Readme Update