Tidied up a sections after the last PR.