Change factory remove the getInstance method to improve readibility.