Moving code that doesn't belong in Factory out