Refactoring part III