Improving code architecture 4