Improve variable and function names
Improve variable and function names