getting rid of trait in favor of testable class