Clean up, improve README