Slight improvement, cleaner and hint only appears on first command attempt