Pull to refresh refactoring