Some clean up and updated the README