Code clean up
Added --verbose option