Minor refactoring based on PR feedback

https://github.com/ministryofjustice/prison-visits/pull/92