Update README and clean up code