Refactor Factory Exercises 1-7