Verbosity: clean up for Jono