- code reordering
- code cleanup
- code cleanup