Better code structure