Use var for variable
Reordered methods