Incorporate pingu's suggestions wrt verbosity