Refactoring source code - part 6