Follow-up from "fix: add a lot more contextual logging to make errors more useful"

The following discussion from !73 (merged) should be addressed:

• @gnugomez started a discussion:

  thought (non-blocking): This file appears to contain a significant amount of logic that, in a greenfield scenario, should be more decoupled, perhaps through the use of services.

  This shouldn’t be addressed here, but it would be beneficial for testing purposes to decouple this logic slightly from the infrastructure side of things.