Some cleaning and also fixing the messages