Ditch static, follow convention with DI