Refactor many things
Code style
Add imported at time