Cleaned up some messages