Add headings to README, and clean up