Coding style
Layout before move
Improve performance