Improve variable name and formatting