Refresh on Back, some Refactoring