Clean up and better README