Cleaned up the add/change messages