Make it more testable