Further improving code structure.