Clean up and change README accordingly.