Improved code clarity