Improve code clarity and IDE support