Make refresh last more readible
Fix a few comments