Some cleaning and better verbose reporting