Clean-up and fixed README