refactoring exercise 4, and renamed files