Refactoring source code - part 4