refactor
Exercise 1.3