Update and remove outdated comments
Improve fresh function