Refactor/all the things

To go with https://github.com/alphagov/spotlight/pull/567