Remove unnecessary method
Refactor method order