Improve feedback messages