Cleaned up the verbose mode implementation a little.