Refactor refreshes a bit