refactor(branch) renamed some methods