Cleaned up / improved refresh.