Improve code clarity