refactor: Moved implementation details out of `domain` -- Aligned code