Code clean up: variable and function names