Code quality

• Composition for better testability?

  read more