Cleaned up verbosity