Update README and cleanup