*) Code cleanups
*) better verbose mode support
*) Test suite