[Refactor] Reorganized in methods