Cleaned up unnecessary verbosity