Some refactoring in call method