initial refactoring-exercise