Clean code
Improve sampling message