Improve variable naming and documentation