Initial exercise of code refactoring