Loading/Updating Message cleanup

Addresses #662