Refactor to one more method