Reduce verbosity, restructure msgs