More tidying up

* Fixed 'Sword and Shield' alias
* Move functions to the start of the document