Clean up and update README