Pull & Refresh refactorized