Reformat code
Merge branch 'hoards' of https://github.com/findsorguk/findsorguk into hoards