Cleaned up some over-verbosity