Refactor for formatting
Merge branch 'demo' of github.com:ministryofjustice/tribunals_base into demo