Refactoring source code - part 8