Refactoring source code - part 7