cleanup and added follow-redirects requirement