Added formatting in some scattered files containing system messages