Cleaning
Fix bug messages