refactor: rename and move some methods