Use appropriate variable name
Optimize function order