More factor out