Improve retry messages and color them yellow
Improve retry function