More code cleaning, improved verbose mode