Cleanups and verbosity