MS-380: formating consistency