Refactoring - part 2