Refactor method