Refactoring source code - part 5