cleaned up and improved message