Cleanup and adjust hint messages

Signed-off-by: Kaustav Das Modak <kaustav.dasmodak@yahoo.co.in>