Refactors

**Description** I am working on adding the buyer exchange actor. While doing that, I have done a bunch of small refactors which, although related to the addition of the new actor, are beneficial on their own. I'm submittin the PR to avoid a huge PR one I add the buyer exchange actor
**Testing** `sbt clean compile test`