Remove comment
Make default callback more informative by case