Improved messages and removed debug statements