Refactoring onRefresh code - to fix Trav29 - Build OK - WIP.