refactor: reorder methods