onRefresh - Refactoring - WIP - Build OK