Refactoring exercise-58
Adding exercise-59