Code clean
Fix error messages