refactor: change methods