Refresh refactor