general clean up, beautify update message