Improve naming
Reorder vars