Changed headings to be more succinct and consistent