*) Code cleanups
*) better verbose mode support