Refactor method to scope