Improve use of internal vars
Improve naming