refactory, add informative message