refactor: rearrange methods