Cleanups code a bit as well as making verbose default.